From: Clemens Buchacher <drizzd@aon.at>
Date: Sun, 1 Jul 2012 16:48:48 +0000 (+0200)
Subject: networkAgent: use absolute path if configured
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6380
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8845a2170c01f83ac23b54ef6f6389b94b142f78;p=gnome-shell.git

networkAgent: use absolute path if configured

Signed-off-by: Clemens Buchacher <drizzd@aon.at>

https://bugzilla.gnome.org/show_bug.cgi?id=679212
---

diff --git a/js/ui/networkAgent.js b/js/ui/networkAgent.js
index cc44fa2ab..c9473a766 100644
--- a/js/ui/networkAgent.js
+++ b/js/ui/networkAgent.js
@@ -683,7 +683,10 @@ const NetworkAgent = new Lang.Class({
                     try {
                         externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
                     } catch(e) { } // ignore errors if key does not exist
-                    let path = GLib.build_filenamev([Config.LIBEXECDIR, binary]);
+                    let path = binary;
+                    if (!GLib.path_is_absolute(path)) {
+                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
+                    }
 
                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
                         this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode };